From 157ef1d3959947593e914496f02a86e2f062a91c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 12 Feb 2023 09:48:49 -0500
Subject: [PATCH] Deprecate GtkVolumeButton

Too specialized.
---
 docs/reference/gtk/migrating-4to5.md   | 6 +++---
 gtk/{ => deprecated}/gtkvolumebutton.c | 2 ++
 gtk/{ => deprecated}/gtkvolumebutton.h | 2 +-
 gtk/deprecated/meson.build             | 2 ++
 gtk/gtk.h                              | 2 +-
 gtk/meson.build                        | 2 --
 6 files changed, 9 insertions(+), 7 deletions(-)
 rename gtk/{ => deprecated}/gtkvolumebutton.c (99%)
 rename gtk/{ => deprecated}/gtkvolumebutton.h (98%)

diff --git a/docs/reference/gtk/migrating-4to5.md b/docs/reference/gtk/migrating-4to5.md
index ebec512d4a..b147fc61ca 100644
--- a/docs/reference/gtk/migrating-4to5.md
+++ b/docs/reference/gtk/migrating-4to5.md
@@ -115,7 +115,7 @@ Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
 This is an oldfashioned widget that does not do all that much anymore, since
 it no longer has a resize handle for the window.
 
-## GtkLockButton is going away
+## GtkLockButton and GtkVolumeButton are going away
 
-This is an very specialized widget that should better live with the application
-where it is used.
+These are very specialized widgets that should better live with the application
+where they are used.
diff --git a/gtk/gtkvolumebutton.c b/gtk/deprecated/gtkvolumebutton.c
similarity index 99%
rename from gtk/gtkvolumebutton.c
rename to gtk/deprecated/gtkvolumebutton.c
index fd82d5a4f0..ce6e535703 100644
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/deprecated/gtkvolumebutton.c
@@ -35,6 +35,8 @@
 #include "gtkprivate.h"
 
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 /**
  * GtkVolumeButton:
  *
diff --git a/gtk/gtkvolumebutton.h b/gtk/deprecated/gtkvolumebutton.h
similarity index 98%
rename from gtk/gtkvolumebutton.h
rename to gtk/deprecated/gtkvolumebutton.h
index 7b5cbe550d..6cad9755d6 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/deprecated/gtkvolumebutton.h
@@ -49,7 +49,7 @@ struct _GtkVolumeButton
 
 GDK_AVAILABLE_IN_ALL
 GType		gtk_volume_button_get_type	(void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 GtkWidget*	gtk_volume_button_new		(void);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref)
diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build
index 608ee6031c..ba23a53699 100644
--- a/gtk/deprecated/meson.build
+++ b/gtk/deprecated/meson.build
@@ -49,6 +49,7 @@ gtk_deprecated_sources = [
   'deprecated/gtktreepopover.c',
   'deprecated/gtktreeview.c',
   'deprecated/gtktreeviewcolumn.c',
+  'deprecated/gtkvolumebutton.c',
 ]
 
 gtk_deprecated_headers = [
@@ -106,4 +107,5 @@ gtk_deprecated_headers = [
   'deprecated/gtktreestore.h',
   'deprecated/gtktreeview.h',
   'deprecated/gtktreeviewcolumn.h',
+  'deprecated/gtkvolumebutton.h',
 ]
diff --git a/gtk/gtk.h b/gtk/gtk.h
index b46c3d05f4..fb7ee34019 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -290,7 +290,7 @@
 #include <gtk/gtkversion.h>
 #include <gtk/gtkvideo.h>
 #include <gtk/gtkviewport.h>
-#include <gtk/gtkvolumebutton.h>
+#include <gtk/deprecated/gtkvolumebutton.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwidgetpaintable.h>
 #include <gtk/gtkwindow.h>
diff --git a/gtk/meson.build b/gtk/meson.build
index 82ad8eff7a..b4e9c9fe3e 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -391,7 +391,6 @@ gtk_public_sources = files([
   'gtkversion.c',
   'gtkvideo.c',
   'gtkviewport.c',
-  'gtkvolumebutton.c',
   'gtkwidget.c',
   'gtkwidgetfocus.c',
   'gtkwidgetpaintable.c',
@@ -613,7 +612,6 @@ gtk_public_headers = files([
   'gtkurilauncher.h',
   'gtkvideo.h',
   'gtkviewport.h',
-  'gtkvolumebutton.h',
   'gtkwidget.h',
   'gtkwidgetpaintable.h',
   'gtkwindow.h',
-- 
2.30.2